Manual merge of version 1:15.0.6-4+rpi1 and 1:15.0.7-10 to produce 1:15.0.7-10+rpi1

diff --cc debian/changelog
index 58c86ee116645522657e6deae6212e0dea6982a6,f04a0c51f47b5a9ab938531c41a1660be533108d..c2e9446809885a61ea600b215c5473152265058f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,49 -1,209 +1,256 @@@
- llvm-toolchain-15 (1:15.0.6-4+rpi1) bookworm-staging; urgency=medium
++llvm-toolchain-15 (1:15.0.7-10+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 14 May 2016 21:43:35 +0000]
 +  * Cleanup .pyc files in clean target.
 +  * Add a hack to the cmake based build to force armv6 (unfortunately the cmake
 +    based build relies on config.guess which assumes you want to build for the
 +    hardware you are running on).
 +  * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that
 +    are broken on lower arm architectures.
 +
 +  [changes introduced in llvm-toolchain-3.9 1:3.9.1-1 by Peter Michael Green]
 +  * disable testsuite (using a method that is hopefully less likely to cause diff conflicts than previously).
 +  * Remove -march=armv7-a in compiler-rt/cmake/config-ix-base.cmake
 +  * Clean up debian/usr in clean target.
 +  * Clean up clang/tools/*-3.9 in clean target.
 +  * Clean up stray *3.9.vim files
 +  * Clean up clang/tools/scan-build/man/scan-build-3.9.1 and utils/vim/llvm-3.9-vimrc
 +  * Clean up debian/*.install
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-1+rpi1 by Peter michael green]
 +  * create build-llvm/docs/ocamldoc/html/ so the install target doesn't complain
 +    about it not existing.
 +  * clean up more crap left behind by build process.
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-3+rpi1 by Peter Michael Green]
 +  * Remove debian/man in clean target.
 +
 +  [changes introduced in llvm-toolchain-7 1:7-6+rpi1 by Peter Michael Green]
 +  * Use libatomic on armhf
 +  * Set cmake/config.guess.hack back to mode 644 in clean target to keep
 +    git/dgit happy.
 +  * Yet more clean target fixes.
 +
 +  [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green]
 +  * Change triplet in debian/rules to use armv6k rather than armv7l
 +
 +  [changes introduced in llvm-toolchain-12 1:12.0.1-16 by Peter Michael Green]
 +  * Disable llvm libunwind on armhf, it seems to come out armv7 contaminated.
 +
 +  [changes introduced in llvm-toolchain-13 (1:13.0.0-9+rpi1 by Peter Michael Green]
 +  * Disable scudo on armhf, it needs atomics which we do not want to enable.
 +
 +  [changes brought forward from 1:13.0.0-9+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 23 Nov 2021 22:37:30 +0000]
 +  * Remove armhf from architecture list for libunwind-13-dev dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 13 Jan 2023 00:15:05 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 31 Oct 2023 22:50:58 +0000
++
+ llvm-toolchain-15 (1:15.0.7-10) unstable; urgency=medium
+ 
+   [ Gianfranco Costamagna ]
+   * Merge branch 14 containing wasm build fixes.
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 08 Sep 2023 00:43:45 +0200
+ 
+ llvm-toolchain-15 (1:15.0.7-9) unstable; urgency=medium
+ 
+   [ John Paul Adrian Glaubitz ]
+   * Disable wasm support on powerpc and powerpcspe
+   * Remove powerpc from BINUTILS_GOLD_ARCHS again
+ 
+   [ Samuel Henrique ]
+   * Explicitly depend on libcurl4-openssl-dev,
+     since nss is being removed. (Closes: #1043551)
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 07 Sep 2023 01:40:17 +0200
+ 
+ llvm-toolchain-15 (1:15.0.7-8) unstable; urgency=medium
+ 
+   * Update gcc-13 patch with another flang build fix.
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 01 Aug 2023 08:12:48 +0200
+ 
+ llvm-toolchain-15 (1:15.0.7-7) unstable; urgency=medium
+ 
+   [ Gianfranco Costamagna ]
+   * Add patch to fix build failure with gcc-13 (Closes: #1037760)
+ 
+   [ Nishit Majithia ]
+   * SECURITY UPDATE: canonicalize pass crashed with segmentation fault
+     - debian/patches/CVE-2023-29932.patch: Use default attributes for
+       intrinsics
+     - CVE-2023-29932
+   * SECURITY UPDATE: One shot bufferize crashed with segmentation fault
+     - debian/patches/CVE-2023-29933.patch: Fix bug in WhileOp analysis
+       verification
+     - CVE-2023-29933
+   * SECURITY UPDATE: convert-scf-to-spirv Pass crashed with segmentation
+     fault
+     - debian/patches/CVE-2023-29934.patch: Account for type conversion
+       failures in scf-to-spirv
+     - CVE-2023-29934
+   * SECURITY UPDATE: spirv-lower-abi-attrs crashes with segmentation faults
+     - debian/patches/CVE-2023-29939.patch: Fix crash in
+       spirv-lower-abi-attributes when the are no SPIR-V env attributes
+     - CVE-2023-29939
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 31 Jul 2023 22:31:23 +0200
+ 
+ llvm-toolchain-15 (1:15.0.7-6) unstable; urgency=medium
+ 
+   [ Sylvestre Ledru ]
+   * Only pass -Bno-symbolic if it exists
+ 
+   [ Gianfranco Costamagna ]
+   * Revert LIBCXXABI_ARM_EHABI => _LIBCXXABI_ARM_EHABI change,
+     FTBFS on arm*.
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 26 Jun 2023 10:13:40 +0200
+ 
+ llvm-toolchain-15 (1:15.0.7-5) unstable; urgency=medium
+ 
+   [ Graham Inggs ]
+   * debian/patches/ubuntu-releases.patch: Update the list of
+     Ubuntu release names
+ 
+   [ Gianfranco Costamagna ]
+   * Add powerpc to GOLD architectures
+   * Cherry-pick upstream fix for newer cmake-related build failure
+   * Cherry-pick upstream fix for HIP search path depending on os-release (Closes: #1037452)
+ 
+   [ Steve Langasek ]
+   * debian/rules: disable -Wl,-Bsymbolic-functions for libomp.  LP: #2016471.
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 24 Jun 2023 20:04:59 +0200
+ 
+ llvm-toolchain-15 (1:15.0.7-5~exp2) experimental; urgency=medium
+ 
+   * Also apply the workround of issue #62621 for focal
+     and to include libpolly-15-dev
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 10 Jun 2023 11:52:14 +0200
+ 
+ llvm-toolchain-15 (1:15.0.7-5~exp1) experimental; urgency=medium
+ 
+   * Remove old code to manage Debian stretch
+   * Force the replacement of new Ubuntu packages introduced in
+     https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-15/+bug/2008755
+   * Adjust LIBCXXABI_ARM_EHABI => _LIBCXXABI_ARM_EHABI
+     Issue: https://github.com/llvm/llvm-project/issues/59240
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 04 Jun 2023 11:35:54 +0200
+ 
+ llvm-toolchain-15 (1:15.0.7-4) unstable; urgency=medium
+ 
+   * Fix debian/libclang1-15.symbols soname
+   * Remove build artifacts if any
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 15 Mar 2023 21:45:46 +0100
+ 
+ llvm-toolchain-15 (1:15.0.7-3) unstable; urgency=medium
+ 
+   * Disable the flang autopkgtests on unsupported architectures
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 12 Mar 2023 11:19:54 +0100
+ 
+ llvm-toolchain-15 (1:15.0.7-2) unstable; urgency=medium
+ 
+   [ Sylvestre Ledru ]
+   * Yeah, we would like to have this version in bookworm
+     (Closes: #1032316)
+   * Adjust some lintian overrides
+   * Disable flang on s390x. Seems that it is breaking
+ 
+   [ Gianfranco Costamagna ]
+   * Update print lldb python patch, following what was done
+     in automake for newer python
+ 
+   [ Samuel Thibault ]
+   * Fix disabling amdgpu on non-Linux.
+ 
+ llvm-toolchain-14 (1:14.0.6-16) unstable; urgency=medium
+ 
+   [ Sylvestre Ledru ]
+   * also apply the wasm build fix
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 08 Sep 2023 00:41:35 +0200
+ 
+ llvm-toolchain-14 (1:14.0.6-15) unstable; urgency=medium
+ 
+   [ Sylvestre Ledru ]
+   * Strip -fcf-protection for wasm build - new flag added in dpkg 1.22
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 07 Sep 2023 11:25:23 +0200
+ 
+ llvm-toolchain-14 (1:14.0.6-14) unstable; urgency=medium
+ 
+   [ Gianfranco Costamagna ]
+   * Fixup typo in spirv detection
+ 
+   [ Samuel Henrique ]
+   * Explicitly depend on libcurl4-openssl-dev,
+     since nss is being removed. (Closes: #1043550)
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 07 Sep 2023 01:39:17 +0200
+ 
+ llvm-toolchain-14 (1:14.0.6-13) unstable; urgency=medium
+ 
+   [ John Paul Adrian Glaubitz ]
+   * Don't run chrpath for libclang on powerpc and powerpcspe
+ 
+   [ Faidon Liambotis ]
+   * Update the wasm-sysroot-usr.diff patch to restore functionality that was
+     accidentally dropped when the patch was forward-ported from 14 to 15. This
+     resolves an issue in which clang++ builds would fail if libc++-15-dev was
+     installed alongside libc++-15-dev-wasm32. (Closes: #1029010, #1032317)
+ 
+   [ Cordell Bloor ]
+   * Backport support for HIP in /usr and add Debian paths
+     for rocm-device-libs to search list (Closes: #1031808)
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 15 Jan 2023 10:54:41 +0100
+ 
+ llvm-toolchain-15 (1:15.0.7-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Upload to unstable
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 08 Jan 2023 12:31:57 +0100
+ 
+ llvm-toolchain-15 (1:15.0.6-5~exp3) experimental; urgency=medium
+ 
+   * Don't always build flang
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 07 Jan 2023 23:46:18 +0100
+ 
+ llvm-toolchain-15 (1:15.0.6-5~exp2) experimental; urgency=medium
+ 
+   * Restrict flang on 64bits archs:
+     (amd64 arm64 mips64el ppc64el kfreebsd-amd64 s390x ppc64 sparc64 riscv64)
+     See: https://github.com/llvm/llvm-project/issues/59845
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 06 Jan 2023 13:19:48 +0100
+ 
+ llvm-toolchain-15 (1:15.0.6-5~exp1) experimental; urgency=medium
+ 
+   * Add flang-15 and libraries support
+   * Several changes coming from the branch -14:
+   * wasm support significantly improved with several packages:
+     - libc++-15-dev-wasm32
+     - libc++abi-15-dev-wasm32
+     - libclang-rt-15-dev-wasm32
+     - libclang-rt-15-dev-wasm64
+     It is now as easy as:
+     $ apt install clang-15 lld-15 libclang-rt-15-dev-wasm32 wasi-libc
+     $ clang-15 --target=wasm32-wasi helloworld.c -o helloworld.wasm
+     Many thanks to Faidon Liambotis
+   * libclang-common-15-dev splitted into different packages:
+     - libclang-rt-15-dev
+     - libpolly-15-dev
+     - libclang-rt-15-dev-wasm32
+     - libclang-rt-15-dev-wasm64
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 03 Jan 2023 00:40:25 +0100
  
  llvm-toolchain-15 (1:15.0.6-4) unstable; urgency=medium
  

diff --cc debian/control
index 02cb8566aa1356f3abbad209ba37f1b0542f0720,f2d4f6202e8893a9a338e1c5c420efddbc5b8b6d..71a08f4fdc0886d1ad36f410616eb123b499c944
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -16,11 -16,11 +16,11 @@@ Build-Depends: debhelper (>= 10.0), cma
      lcov, procps, help2man, zlib1g-dev,
      g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32],
      libjs-mathjax, python3-recommonmark,
-     doxygen, gfortran,
+     doxygen,
      ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x],
 -    ocaml-findlib [amd64 arm64 armhf ppc64el riscv64 s390x],
 -    libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
 -    dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
 +    ocaml-findlib [amd64 arm64 armhf ppc64el s390x],
 +    libctypes-ocaml-dev [amd64 arm64 armhf ppc64el s390x],
 +    dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el s390x],
      libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
      llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
      llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
@@@ -31,8 -32,8 +32,8 @@@
      libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
      protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x]
  # "| hello" is for older buster/bionic distros without spirv support
 -Build-Conflicts: oprofile
 +Build-Conflicts: oprofile, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev
- Standards-Version: 4.2.1
+ Standards-Version: 4.6.2
  Homepage: https://www.llvm.org/
  Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 15
  Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/15

diff --cc debian/patches/series
index 352d029556aa1ef80ea6f12426f24eb99274d96d,ad4fe8ceee8d5f5b96606c5f3c6b55312ea0659c..f2cb857d402db65f0b7185ae074619f2455c6dae
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -131,4 -158,15 +131,15 @@@ protobuf_3.21.patc
  add-arm-vcmpz-test.patch
  fix-mesa-build.patch
  link-grpc.diff
 -
+ amdgpu/nonlinux.patch
+ amdgpu/usr-search-paths.patch
+ amdgpu/bitcode-multiarch.patch
+ ubuntu-releases.patch
+ new-cmake-build-fix.patch
+ HIP-search-path-fix.patch
+ CVE-2023-29932.patch
+ CVE-2023-29933.patch
+ CVE-2023-29934.patch
+ CVE-2023-29939.patch
+ gcc-13-build-fix.patch
 +raspbian-triplet.patch

diff --cc debian/rules
index c31908ea48d4ea88e766fc6621330ae0c6bb611d,d1ca6656283c5915fb629593c8955fee55b05dbe..a35f264c03c576edbd99db7c9c1a885e90d0045c
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -500,13 -528,8 +535,14 @@@ preconfigure
        @echo "LIBFUZZER_ENABLE=$(LIBFUZZER_ENABLE)"
        @echo "LTO_ENABLE=$(LTO_ENABLE)"
        @echo "COMPILER_RT_WASM_ENABLE=$(COMPILER_RT_WASM_ENABLE)"
+       @echo "LIBCXX_WASM_ENABLE=$(LIBCXX_WASM_ENABLE)"
  
 +      # add executable flag to script we added as part of triplet hack
 +      # --plugwash
 +      chmod 755 llvm/cmake/config.guess.hack
 +      # also make sure config.guess is executable
 +      chmod 755 llvm/cmake/config.guess
 +      
        for f in debian/*.in; do \
                f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \
                echo "$$f => $$f2"; \
@@@ -864,9 -1000,9 +1013,10 @@@ endi
                cd openmp/runtime && doxygen doc/doxygen/config; cd -; \
                cd openmp/runtime/doc/doxygen/generated/html/ && rm jquery.js && ln -s /usr/share/javascript/jquery/jquery.js; \
        fi
+       touch $@
  
  override_dh_auto_install:
 +      mkdir -p build-llvm/docs/ocamldoc/html/
        # Clean up temporary files to make sure the install works
        rm -rf $(find $(TARGET_BUILD) -wholename '*CMakeFiles*' -not -name CMakeLists.txt -a -name "*.dir" -type d)
  
@@@ -1254,20 -1406,7 +1420,20 @@@ override_dh_auto_clean
        rm -f $(CURDIR)/clang/tools/clang-format/clang-format-diff-$(LLVM_VERSION)
        rm -f $(CURDIR)/clang/tools/clang-format/clang-format-$(LLVM_VERSION).py
        rm -rf libclc/build
-       rm -rf build-compiler-rt-wasm32 build-compiler-rt-wasm64
 +      rm -f `find . -name '*.pyc'`
 +      rm -rf debian/usr
 +      rm -rf clang/tools/*-3.9
 +      rm -f `find . -name '*3.9.vim'`
 +      rm -f clang/tools/scan-build/man/scan-build-3.9.1 utils/vim/llvm-3.9-vimrc
 +      rm -f debian/*.install
 +      rm -f clang/tools/scan-view-7.0/share/FileRadar.scpt clang/tools/scan-view-7.0/share/bugcatcher.ico
 +      rm -f `cat debian/morecraptoremove`
 +      rm -rf debian/man
 +      rm -f debian/*.links debian/c*.lintian-overrides debian/l*.lintian-overrides debian/*.META debian/*.dirs debian/*.docs debian/*.symbols debian/*.postinst debian/*.manpages debian/*.examples debian/*.binfmt debian/*.prerm
 +      -rmdir clang/include/clang/Debian/
 +      -rmdir lldb/docs/doc/
 +      chmod 644 llvm/cmake/config.guess.hack
+       rm -rf build-wasm
        if test -f lld/docs/ld.lld-$(LLVM_VERSION).1; then \
                mv lld/docs/ld.lld-$(LLVM_VERSION).1 lld/docs/ld.lld.1; \
        fi